Fixed up naming issue and now everything is beautiful =D