Migration from 5.7 to 6.2

I have created a custom addon in 5.7 named customacceleratorstorefrontcommons to customise some files present in acceleratorstorefrontcommons like bruteforceattaccounter, storefrontauthenticationsuccesshandler and AddressForm. We copied the same bean id(wherever required) to our addon's spring.xml or storefronts spring-security-config.xml. This worked perfectly fine in 5.7. In 6.2 however we are getting the following error:

Error while creating bean "loginAuthenticationSuccessHandler" as property named 'bruteForceAttackCounter' must be of required type [de.hybris.platform.customacceleratorstorefrontcommons.security.BruteForceAttackCounter], but was actually of type [de.hybris.platform.acceleratorstorefrontcommons.security.DefaultBruteForceAttackCounter]

Similar errors were observed in other files as well. Is there a structural change from 5.7 to 6.2 because this approach worked fine in 5.7 but throws BeanCreationException error in 6.2.

Also what should be the approach if one wants to edit files which are present in acceleratorstorefrontcommons ?